bitkeeper revision 1.34 (3e4cfce1Ot4YJzJ4jwNjDthlFrZV5w)
authorakw27@boulderdash.cl.cam.ac.uk <akw27@boulderdash.cl.cam.ac.uk>
Fri, 14 Feb 2003 14:27:45 +0000 (14:27 +0000)
committerakw27@boulderdash.cl.cam.ac.uk <akw27@boulderdash.cl.cam.ac.uk>
Fri, 14 Feb 2003 14:27:45 +0000 (14:27 +0000)
commited220108094cf8e5c3f70a7421182cdbcb59f3d3
tree22722275b0a231a057b08d99825b24d551545396
parentce62d9e7f6d76422b025939279a2a51b5262a06d
parent77cf55f0b8964f4d82d7119bfe59db8fddf4b320
bitkeeper revision 1.34 (3e4cfce1Ot4YJzJ4jwNjDthlFrZV5w)

conflict resolution.
.rootkeys
BitKeeper/etc/logging_ok
xen-2.4.16/common/domain.c
xen-2.4.16/common/event.c
xen-2.4.16/common/kernel.c
xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h